endSessionDialog: Prepare updates also in the "Restart & Install" dialog

The current code expects a checkbox to confirm update installation to be
present, but when the updates are already scheduled, it did not confirm
the actual user action for the update, aka to reboot the machine, instead
of using the previously set update action, which could be Power Off.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4185>

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 84da305582d213931e4c68e6023a866a8a768147..e803785d74ec3be4c8c30f2132e047b05d2e7f63 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -491,6 +491,8 @@ class EndSessionDialog extends ModalDialog.ModalDialog {
             } else {
                 await this._triggerOfflineUpdateCancel();
             }
+        } else if (this._type === DialogType.UPDATE_RESTART && (this._updatePrepared || this._updateScheduled)) {
+            await this._setPostUpdateAction(OFFLINE_UPDATE_ACTION_REBOOT);
         }
 
         this._fadeOutDialog();